Continued work on bug 1107706