may lead to an adequate fix when no peer is connected - testing some more
will maintain the customized projects out of tree for now
misc