Fix extended (somewhat