Issue 1527

I think this is the easiest way to address this issue.