Fix Bug introduced in security update and syncing issue