This is a fix for #255