Apply @dooman87's fix for #51.