Upgraded to require 2.1.8