Bug Fix

Assign operator to department Bug Fix
Revert "Bug Fix"

This reverts commit 85894c94e55b59b2a1b351ca2698e3f13a89bd76.