Fixed error in event queue routing