Fix for intial composer use