Bug fixing adventure (hotfix leading up to a fix)