Fix #33
Merge branch 'bugfix-#33' into staged-changes