Cannot rely on just creator anymore
Merge pull request #1534 from marcel-blonk/release-62

Cannot rely on just creator anymore