Closed amitdahan closed 2 weeks ago
Closes #1464
Was really not sure about the eventual solution, but it seemed to do the trick and all other tests remain passing.
Closes #1464