Rest class fix 2