Rest class fix 4