Fixed issue #178