Fixed Workaround for #SCL-6829 Comment