Issue #38: Initial proposed solution to the issue. Has to be verified in
test deployment.