Fix for bug #2736