Fixes #393
Fixes #394