modified composer from pull request