Fix for bug 1019880