17050 - fix UnsupportedOperationException