Fixed NoMethodError