Modif suggested by Kazuhiko to avoid SQL injection vulnerability