Fix syntax error
Merge branch 'fix_syntax' into 7d-fixes