Fixed `this` issue