Recreating message_handler branch
Fixing race condition