Fixed bug that would swap too old/not too old