current_user fix