Fix regression introducted by fix for #199