timezone issue fixed