attempt bugfix again...