Fix for bug #2624

...g #2624