fixed classcastException