Fix #2944
Merge pull request #2946 from Nami-Doc/issue2944

Fix #2944