Fix check if not empty