Fix for extensions