bugfix part 2: fix it for real this time?