Fixed some regression & limit to a single command