Bug fixing even more