Move to a bullet event system (a slightly better hack!)