fixes #33

should finally fix the rest of #33