*Fix years calculation