Fixed issue #79