Initial bugfix.