Fixing subdefinitions