Fix for use of empty stretcher