Fix for empty listeners
fix for empty listeners