Crucial bugfix