change to fix timezone issue