Bugfix: 97% fixed