Fix [Issue-6] for 1.9.x

3 files changed