fix flip js
Merge branch 'master' into brumdebug