OA-516 Fix