Fix stuff

Fixing #4