Fixes for solution sketch for issue #1642.