Sneha - fixed initial loading bug