KJ-4 Fixed leftover bug related to ClassCastException.