empty popup bug fixed