Bugfix regarding signature