issue #30 deal with bugs in alignment handling