Workaround for M-x