Fixed issue #156