Fix for #414

Fixes #414.