FIX: Population reset to zero on saving