Selection draw and final draw fix.