Fixed timing issue!!