4.0 branch fix:
https://github.com/bigtreecms/BigTree-CMS/issues/106