Fixity Fix-179 and Fix-180 Done