Fix for SAM Rest service