Solving bug when its empty