Fix retain cycle (issue 1404)
Merge pull request #1458 from mirego/fix-issue-1404

Fix retain cycle (issue #1404)