BUGFIX: Fixed syntax errors

Change-Id: Iab3fae7ff65278d40efefb097624b8029d6ac550