For ENG-5803, implemented Paul's suggestion incorrectly