Extension declaration fix