Fix after upstream merge #159