fixing Reopened #132

Reflecting to master too. #132