First fix for MAntis issue #129