This fixes #275