Should fix issue #5