stopped passing through listener because it was causing a serialization bug