remend bug on date