bug fix for non-sync situation