crucial bugfix