Removed last FIXME after manually verifying all calls to the method.
Merge pull request #75 from kruland2607/master

Removed FIXME