Fix SA-CORE-2014-005