#6745: Implementing proposed solution