alignment fix merged from HEAD