Fix edge case with the composer sys