Fix ext / int conflict