Updated for ticket fix