syntax change and bugfix