hwa: fix composition type