this is [#6104] a fix