Fix the FIXME
Merge pull request #140 from tomaka/fix-89

Fix the FIXME