Bugfix: 90% fixed by now