Fix COV#1250308 and COV#1250307