Fix empty entry bug