Fix retain issue