fixes_1 - bug fix for 768 and 798