Fix for decorators_null use case