Fixed code overhang