Potential fix for #274.