Work around possible mutable data issue #501