Issue #9 Fix year