issue #428