fix regexp and order