updating with patch from pull request