Update control to fix logic