Improve vagrant #16