CLC-1051 Fill in now asfor timestamp if it's nil