crappy solution to Issue #422

please feel free to ignore this crappy, very-quick, solution to this issue, I have not thoroughly tested.