[#67823438] Fixed