Fix for #123308, raydiak++ for spotting