Yeah, should not refactor one instance only...