Bug fix: #384561 - solved some errors