Attempted bugfix again..