Fixes #326