Fixes events not being called, I hope?