Fixed potential security issue reported by CESICAT