Fixed recipients todo