finally fixed boat sync issues