Fix major issue with signature checking