Fixed #7673

This is for #7673