Fixes constructs not passing their shades properly