Better fix for retain/release issue (mac)