Implementing feedback from Nicolas Gallagher. #FTW!