Issue 89,90 fixed syntax error