accidentally reopened #943, fixed now