Fixed issue #8405: Date/time doesn't work correctly
Dev Partial fix