fix ClassCastException for #6462
CHANGES