fix for end toa