Fix for #51