Fixed a bug with subscriber select