Forgot to remove FIXME… again