Fixed ass3 bugs