Fixing extend order