Bug##1021212

Here's a PR!