merge in small fix to avoid renaming problems