Better bugfix