bugfix and fix typo