Build for the #281 pull request