Fixing issue with event order;