Added Fabio's SMALL_POP fix