Quick fix for Bug #4040.