B328

for #328