current_user fixed