Fixes #396

Fixes #396