Removing fib.
Fixing argument parsing order.