attempt to fix #170 

@jakobherpich can you try this out and see if it does what you think it should do?