Fixed issue #48