fixed ma bug