Cochran, fixes #522