Ensure correct alignment