hackfix for #210

we should do this the Right Way later, but this solves the issue for now