fix hack in previous release

This release makes the fix present in the last release more general, rather than a hack just to fix one specific problem.