Fix order of signatures to be consistent