Make shadow condition more coherent