Fix for #47