Fixed bug where enqueue should have waited for other event to finish