Fixes #267

Fixes #267