Fix issue #827
Fix issue #831
Version 0.13.43