Fix for 1253

Fixes #1253