Fixed ClassCastException