Fixed major security loop-hole