Fix for #355