Add workaround for vim here too