Fix 1480, 1483, 1497 $this instead of $object