Fix double CR security issue with a hack.