Fixed bad ext
Merge branch 'bad_extend' into develop