Add enabled flag (also a missed check in shell_run)