fix failing tests for issue #8619 on 32-bit systems