Fixed issue #76