Added logic to prevent starving the event loop
Version 1.5.2