Well, at least folders work correctly now