[#895252] Bug fix