Added fix for extension overriding