fix fall through callback fixes