MANTA-24 one more fix..