Fixes #324