Changing specs to match discussion in issue #380 and fixing implementation to match