Add standard fix, tests