Final fix for x length