Should fix issue #4