Fixed for less strict dependencies