fixed user_data handling