fixed current_user method