fixed ClassCastException