Replacing now() see BT#8397