fix sytnax error
Merge branch 'trent'