fix make-component