Fix development ready

Based on previous PR