Paritally revert #359
Merge pull request #360 from raven02/patch-3

Paritally revert #359