Fixes issue with send_first_time_message