#420 Follow the same prepend order as v 3.x.x