fixed current_user