Fix for #31