Fixed issue #49