Bugfix: Trying to make it work like it should