Update to match czechboy0's pull request