Try to fix it quick and dirty