Try fixing the key stealing bug