Should fix issue #68