Year bug fixed
Year detection improved