Fixes #43
Fixes #43