BAC-505: $this to global