fix handling of commin files