Fix for the dreaded sync bug