Another hot fix for #550