Fixed bug in driverListener function

Jira issue: WP-1125