Fixed Bug #1386446, #1386450