Add extra xchecj
Protection agains corner cases
sync