Bugfix in new GUI