Removed a FIXME that is fixed in this PR