Bugfix 22

Should close #22.