fix org issue