Fixes #389

Fixes #389