Fix and build for #284