fixed signal issues issues with focus