fixed: don't break without token