comment and bugfix