One simple bug-fix. Now restucture.