DL-60 Bug fixing