Fixed issue #146