Fix REST mode