short-types: second try to fix stack overflow bug

Previous fix just broke the short-type patch