Fix issues #2160, #2161
1 file changed