Smtie fix
Jayce fix???