Fix duplicate MPU issue