Composer's bugfixs