Fix retain issue with deflections as well