Removed old FIXMEs

The problem has been fixed by pr #251
Fix #1001310