Add a workaround for #271, fixes #271