Fix for #622