Fixed a more clean security approach.