Bug Fix

Moved location of Current Listeners