PR #116

This fix PR#116