Fixing signature handling