Bugfix, some more needed.