Fixed no data bug