Fixes #327