[Fix] check for empty too