Fix bug in Surface align adjustment fix