EPI alignment. Fixes #491.