Properly Fix #301
Merge pull request #303 from conde2/master

Properly Fix #301