fixed crashing of DTAP