fix OEMASK handling