Fixed possible security issue