Fix for issue #428