changed user_id to nil
merged 117