Bug Fix ; Year replace logic