Fix for #73