fixed permission conflicts