Fixed some bugs on fib2