Repeat unitl hot fix, final changes