Bugfix- no more NoMethodErrors