fixed from UUAG