Fix forceSync issue by using custom wrapper