Fixed bus. Tickets #1562, #1556.