Fixed issue #71