Fixing #74. (hopefully)