fixed tickets 569 & 2787