Hotfix/6.1.4

Sorry for the last two commits. My fix doesn't solve the problem.
My sincere apologies for the hotfixes. The code is restored to the original state.