Fix for security and usability