Fixed code for this issue
Updated CHANGES