Fixed issue #72