changes for jbide-13213 forcing a model listener instead