608 fix

Assumptions are the mother of all...