Bugfix, and disable essential objects deletion