fix Q issue with emit