Incorrect 'self' after refactor