alignment fix/time zone fix