Fixing optional extensions