Fix critical vulnerability: SA-CORE-2014-004