Fixed timing issue in start up