Should fix issue #61