Fixed bugs #4114, #4115