More bugs somehow... :s