A small change in order to make it organization-aware