Bugfix timezone support