-FIX: Bugs, bugs and more bugs.