Bugfix/116 encryption cbc vuln