one more important improvement #SCL-6829 Comment