Fix potential ClassCastException