Fix Ticket BB-133