This is related to issue #6544