Fixed to return self