Fix for review comments

 - this should be done with a Requirement, I should have been clearer earlier.