Fixed the syntax errors occured due to last commits :D