Fixes #43