Hack to avoid misalignment on 6,000