update to make it work more smooth
bugfix