Fix2 issue #49