better support for date