Rest class fix 3