Little fix to align Organization Module to others Modules