Should fix issue #160