Bug fix for extension