Same bugfix again, this time manually tested