Almost fixed buggs