Fixed issue #177