Fix mako pinin + self.client property