Is this for fixing #1179?