Fixed more code overhang