Fix "that" reference and variable used. TODO: refactor this mess of a feature.
Fix "that" reference and variable used. TODO: refactor this mess of a feature.

marekr/siggy,marekr/siggy,marekr/siggy,marekr/siggy