potential fix for issue #411