Should fix issue #3