Fix for Photon errors