some improvements to rules out other possible problem sources - this change does no seem to affect the behavior