remove 187 special casing