Fixing issue in ${name}