Fix for Node Event creation