Minor fix for shadow remove correctness