minor FIXME query