Shadow issue fixing