Fixes#41