Readd our command.js and apply fix to join