Fix for #267

Fixes #267