fixed user_id references