another round of fixed for extend
another round of fixed for extend