fix the bug i just introduced with the other bug fix
Merge remote-tracking branch 'upstream/master'
update some ish