Lps 42575

Hey Shinn, I think I made a fix that won't break the other issue