resolved FIXME to a comment