Fixed with Kelsey's pull request changes