fixing DST problems