Bugfix: 99% fixed