Fixing contact Sai Maa bugs