Bug update from fathimath and Yagyadeep