Potential fix for #409.