RIFT-14432: Composer choice/case fix