fix syntax error, merge @silentworks changes