Fixed hack now that retain bug is fixed