Theif unexpected bug fix