Fixed issue #159