partial fix for issue #472