Issues/2013 do not photon photon

Closes #2013