Fixed eachchange event