fix tickets 16, 17