Hack fix for Bug #1899