Adding overflow back because it helps performance somehow