Partial fix for Bug #390