Fixed order issue in tables