Possible fix issue #44