Same bugfix as before