Fix OnPublicCall not being called for non-standard callbacks