Revert "Fixing issue #207"

This reverts commit dc4e56408f58482c3a2308cb15dc685e00d862ba.
Fixing issue #207