Fix for #63