Fixed timing issue