part of fix for issue #402