Rest Service fix