Date stem simplefix

replaces #2839

Closes #2602

Minimal fix as suggested by @efiring