Fixed bugs with extensions