Fixed bug when no initial data