Resolve #1386

Oops forgot to create a new branch. NVM that doesn't affect this pull request.