Fix to 5071 patch
Merge pull request #11 from Celedhrim/experimental

Fix to 5071 patch