Merge pull request #95 from Karm/1.2.9.Final-fix-BZ987259

1.2.9.final fix bz987259