fix usage of proper instance variables