Changes to fix secutiry by pass issue