Event queue seems to do something correctly now.