Rest class fix