real fix for bugs