Fix issue #48