Should fix issue #1