fixed collection listener
fixed collection handler