falcon : fix sync issues