Fix #287 - Timing issue regarding upstream syncs

Fix #287