credit to Jeff Stamerjohn for the actual commit