Fixes#44