Fixes #396