Fix Critical Security Bug