Temporary DST fix. Need a more intelligent way of doing this