Alignment issue fix