date issue fixed #2