should stop hanging
fixed for openshift
added find all comments