Solve bug in #35

username-removed-263173 requested to merge dev into master Mar 27, 2017