Manually add boxes from GH-155