MANTA-81 fix #3