Should fix issue #49