fixed #current_user