Years fix, First version