Fix shadow bug, but this time, for the new branch.