Fix for v2014.7.0rc7