Fix #10217 (misaligned markers in composer)