Fixed issue #291