Fix to have a proper 'this' within module