Fixed Success contain

#430 & #1022