fix wrong var names, along merge with pbiecek