Fixes instance variable refactoring