forgot to merge this fix
Major rewrite & cleanup of SATO code
Merge branch 'master' into no-label