[VULN] Fixing #53