fix the potential security problem, which was preventing from being approved by AMO