Let's (finally) fix the ShadowCatcher