My jshint complains about this change...