Fix for fix bug on /organization