Pull request for: #1199