Fixed tickets #1562, #1556.