- bug on empty resolved