Moved listener to main thread