Fixed issue #428