#37: Implementing proposed fix