fix timing issue?