teiiddes-2313

Corrected ClassCastException when editing REST CP