Removed a FIXME mark