Fixed issue when enabling edit tracking