Bugfix, first working version.