Fixing issue with injecting variables