fixed current_user bug