Reverted some bad fixes
Implemented a better fix
Updated the change log