fix a bug in order action handling #6042