More fix for #63