Fix Thorn bug