A fix to UpdatedProgrammatically issue