Minor bug fix
Minor revert
Implementation for an Issue #332