3.x de fixes #205

Closed andrii-pukhalevych closed 4 years ago