typo and bugfix