Bug fix - datetime_now is now not constant