Fix issues #2160, #2161