2014.5.31-fix-delta-bug