Revert "Revert "fixed alignment""

This reverts commit 8039b6551305bd895bf54813a29d40d6509fd2bd.