Rest Api Fix