Merging #142 fix back to 2.1.3