Fix bugggs again