another fix to current_user