bugfix and typo