Fix - ClassCast exceptions should not show up anymore