Added a work-around to bug #15942