Fixed issue #426