crappy solution to Issue #422