Try fix issue #7544

Try to fix issue #7544