Fixes instance variable passing