Fixes #12

Forgot to remove FIXME tags