Fix issue #45