FIX: Drop count calculations with new page