bugfix on previous