Fixed issue #196