Fix Issue A201406201556 #2