One more attempt to fix issue mentioned in previous commit
One more attempt to fix issue mentioned in previous commit

tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird