Check the syntax fit for ST2

It works well with new changes on ST2 now.