Fixes #40