version 1.6 fixed last day count