Potential fix for issue 267