Merge pull request #1605 from rspec/alternate_implementation_to_1602

Alternate 1602 implementation