updated creator attribute with conditional check