Extension Fix