Conflict of class and folders fields

[hbowie]

Thanks for finding and reporting this! I believe the latest beta should provide a fix. Let me know when you’ve had a chance to test.