fixed special case on creator [#25232]