Simpler fix and solution.
Simpler fix and solution.