Fix it quick and dirty