Applied SimpleDescriptor bugfix from master