Fix bug 3214, alignment