Possible solution to Bug #2785