fixes #32
fixes #33 (little bit of a hack)