potential fix for issue #622