Fix for bug #2544