bugfix in the right place