Simpler fix for #63