fixing Reopened #132

First of all fixing in 1.0.x. #132
Once 1.0.x is mearged, I will modify to master too.