Better Fix for my sync issues