Fix composer after merge with master

Re add code removed in d32323f
Fix for composer for a7e6ae5