Don't forget to preserve mode on other commands too