I should probably make this change under pull request #404 right?