Alignment Bug Fix