Fix for is_empty