Bugfix and timezoned dates