fix alignment to avoid conflict with other PR