Fixed scope for has_one_current