hack for timezone issue