fixing pluging variable references so it validates correctly now