258-D7: Added 'safe-guard' for non-overlapping years issue