Fix for bug Bug #1098