Same time Modification problem fixed