Issue 952

Fixes #952.