FIX : timing error bug