fixed leftovers from move