fixup! Order of firing events