32-bit MAF bugfix