Fix
Removed fixme
Merge branch 'c3'