Fix: missing $st
Fix: handle element special case better