Fixed: waiting modules should be notified as a queue