Fixed instance variables. Thanks Albert.